feat(features): register organizations:am3-tier permanent feature flag#117805
Merged
Conversation
The flag is used in sentry/ingest/consumer/processors.py but was not registered in the default manager, causing errors in self-hosted deployments. Mirrors the pattern used by organizations:spans-usage-tracking. Refs getsentry/self-hosted#4377 Co-Authored-By: sentry-junior[bot] <264270552+sentry-junior[bot]@users.noreply.github.com>
github-actions
Bot
added
the
Scope: Backend
![sentry[bot]](https://avatars.githubusercontent.com/in/12637?s=60&v=4){kind=small}
JoshFerge
approved these changes
Jun 16, 2026
sehr-m
pushed a commit
that referenced
this pull request
Jun 23, 2026
#117805) ## Summary Registers `organizations:am3-tier` in `src/sentry/features/permanent.py` so it is declared with the default feature manager. The flag is referenced in `src/sentry/ingest/consumer/processors.py` (used in `collect_span_metrics` to gate span count tracking) but was missing from the permanent feature registry. In self-hosted and single-tenant deployments this causes: > Feature organizations:am3-tier is not registered with sentry.features.default_manager The flag is managed by getsentry/getsentry for sentry.io billing tiers (AM3), so the default here is `False` — same pattern as `organizations:spans-usage-tracking`. ## Changes - Added `"organizations:am3-tier": False` to `permanent_organization_features` in alphabetical order ## Refs - Fixes getsentry/self-hosted#4377 --- [View Session in Sentry](https://sentry.sentry.io/traces/?project=4510944073809921&query=gen_ai.conversation.id%3A%22slack%3ACUHS29QJ0%3A1781575403.587189%22) Co-authored-by: sentry-junior[bot] <264270552+sentry-junior[bot]@users.noreply.github.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Registers
organizations:am3-tierinsrc/sentry/features/permanent.pyso it is declared with the default feature manager.The flag is referenced in
src/sentry/ingest/consumer/processors.py(used incollect_span_metricsto gate span count tracking) but was missing from the permanent feature registry. In self-hosted and single-tenant deployments this causes:The flag is managed by getsentry/getsentry for sentry.io billing tiers (AM3), so the default here is
False— same pattern asorganizations:spans-usage-tracking.Changes
"organizations:am3-tier": Falsetopermanent_organization_featuresin alphabetical orderRefs
View Session in Sentry